many changes to work with new core