Updated to fit shorter routes in NS