Updated to compile and use latest version