Upgraded to PL 0.7.1