Main Compilation Update