Improvements based on feedback from John, Oliver and Glen