Upgraded to core 2.5