New version with conditional compiling options.