moved tasks to controller