Overhaul and pushing travis