Upgraded to core 1.0.6