Revert "Revert "To the end of iteration 2""

This reverts commit b50cd098f499af67295957aeed5b66197e56f144.