Adjustments made after review by agentzh