Fix/change routes