Modified Routing for demo purpose