filled in the row creation/updating a bit #21