move the Core changes to the top