Moderate Update to code