Adpating to changes at core