Chnages to the core
Revert "Chnages to the core"

This reverts commit 7dbd6d1e587edf65cda30d0806edf9ee694fbfe8.
Changes to the core