We should add lots more comments to the solutions, in particular delineating the difference between the USM and buffer variants.