added more shapes