Updated code changes

Updated code changes