changed user definition, new User class