Correct shapes (9/36)

Correct shapes