change default plan type to parallel, added extra wait