Correct shapes (20/36)

Correct shapes