updated Shape, ColoredShape