[TASK] rework core