Circle now extends piston instead of shape, this more sense since everything about the piston depends on what shape it is