Editted route handler