Patched for removal of GentCore