Refactor travis broken feature 2