Modified to pass travis