removed FS and Match task loops, seeing if this works