modify routes and add user
merged and fixed comflicts.