Upgraded to v0.8.2