some changes - round 2