updated server and routes