Some tweaks

Make sure we get Pxdcr value before updating code