New Changes and fix bugs