Removed F waveform type + ensure run order