Code commented, route-map added