exercise 2 done + changed structure exercise 1