Added option for enaling/disabling the pair flagging