update to ex 07 - not finished