Correct shapes (8/36)

Correct shapes