Correct shapes (22/36)

Correct shapes