improved and splitted routes