Correct shapes (33/36)

Correct shapes