reworked in attempt to get to work on travis