#4 added fields to user