[TASK] Complete Rework