edit2
merged edit bhanu2