More Changes to core engine.