Refactor and new QDR code.