Hanan, fix ex 1,2
Hanan fix ex 3