changes from john uploaded