Update after feedback round 2