Update after first review