Updated with thomas's custome route