Correct shapes (32/36)

Correct shapes