Problem 16: solved