working on changes from jon