Minor updates from pairing w Luis