address comments round 1