Chris's commit, as well as other updates from Dr. Howles' testing feedback