Correct shapes (28/36)

Correct shapes