Reworking after splitting out rowr; addition of echo