Incorporated changes in code