Imrpove to fit two tasks addition