Updated With add & remove tasks