changes by sunetra
conflicts resolved