Updated to latest versions 1.0