Added two new shapes, modified shape 02