Correct shapes (10/36)

Correct shapes