routing needs to be fixed