Upgraded with lastest piston