added problem 18 and 22