3rd set of changes

third set of initial reviews