Started FAIMS 2 logic changes