Adding the core changes.
Adding core changes.