updated to use latest versions