[TASK] Update to working state