Using this version for stand-alone build.