Working on new set route