Task grouping introduced, StartAndWait method fixed