Correct shapes (24/36)

Correct shapes