Revert to original compiling code....