Changes after 1st internal review