Correct shapes (15/36)

Correct shapes