Worked on more shapes.