tested and added custom routes