changed strings and added list to User