Update after 1st review