Update to be closer to VZW