Changes after initial review