ShiftAndMatcher fully fixed