Upgraded to latest piston