filled in additional fields
merge
changed method in user model