Upgraded to latest piston-window