Integrated the latest version with a better error diagnostics