Fixed problem 2 and 3 from DK