add check for conditional tasks