Updated task controller