Modifed to pass travis