removed complexity from watch task