changes for iteration 4

changes for iteration 4 - done together at palio