Final touches for the Shapes problem.