- adding the fixes and the code changes