Routes updated #118 and #119