Final Changes to core