Switched core to 7.x