Changed back to >3.1