Changes to code for quality update