cleaning up dates
Modifed users to show current users