adding QR stuff
merge