changed from Citizen to User in some method names