Switching from autopair to native alternative