Add solutions to 2136, 2140