Rohit: Updated Routing