Problem 16 updates