changes merged from vamsi