Fixes 2 iteration
Second iteration fixes