- added code to only enable Core features people want to use