Committing last code of Suresh before my change

Bernd