[TASK] Improve all