improved user management
updated requirements