Changed routing
Refined the comments