Make it more flexible for dealing with 'QR'