refactoring user in progress, update still missing