Correct shapes (14/36)

Correct shapes