Checking in changes based on feedback from Jeremy Worboys