got rid of bug with deleting a row
merged changes