Implemented new routing system