New Changes and fix