Feature/loop round 3