merging changes from seshu