Feature/loop 2nd iteration

Yes, you're right