Feature/loop 2nd iteration

Same comment for current and previous