Moved stuff from piston-event