Added shapes
Merged