[1477] Update after feedback from David