Moved in stuff from piston-event