Finish first cut of the User model