Incorporate feedback from Kent