updated handlers and routes