final implementation changes for the CE stuff...hopefully