Travis pain
chris fixes