updated routing
updated routes from develop