Added new shapes!