review comments from @uboness fixed