major Core rework