changed to new user definition