Simplified the way in which user-creatable shapes are specified in the challenges.