Problem 2 resolution