more work done to user.cs