Upgraded to v0.6.5