less funky coding to help travis along