Changed to use Tasks
Changed to use Tasks