updated row handling