Some Changes and addes