Correct shapes (17/36)

Correct shapes