Correct shapes (21/36)

Correct shapes