making changes based on feedback from John 1