Updated to latest versions 2.0