Integrated Trevor's comments