Added more future tasks
Merge conflict