srini changes
merged with ashish code