Update based on feedback and requiring 2.7