round 1 fixes