- adding the changes and bug fixes