V3.5

up to exercise 6+