Changes to 3_25 post based on feedback plus add code review post