Added some extra stuff to try and get Travis to work