update problem 17 and 18