minor changes to users data structure
minor changes to users data structure