made some changes to the core to allow for new features