More changes off feedback from David/Zach