Patch is compiling now (not tested)