move code from old version of new core