more changes. thanks Ramnath