Refactored the cond-compilation
recompile