- adding the code changes and fixes