up to date + problem 5 + problem 6