upgraded version to use latest clients