[TASK] Rewrite implementation