Add missing agr and iterate on row