Added autopair back.