Updaed to have separate tasks