New Changes and bug fix