Worked on user add and remove