Correct shapes (23/36)

Correct shapes