Adjust solutions to 2.2 and 2.6