Udapted the task