working till new user add, but not structured