c
c
changes merged from vamsi