adding updated code to repo Case#7123415282730