More adjustments made after review by agentzh