[TASK] Update Controller