Added routing changes, There is a problem with routing approach