Made changes to Tasker class in