Edited route
Fixed and improved controller