Some updates
Merge changes in Tasks.java