iteration 4 fixes