major changes in add and remove rows