Rewrote Shapes functions