added age to user model
merged