Correct shapes (31/36)

Correct shapes