Changed Task to be independent of event
Commit