New version before compiling stand-alone