refactoring and added specific route