working to refine user model