getting rid of more funky routing