changes and bug fix