Correct shapes (7/36)

Correct shapes