Full compiling version
Merged