CORE Fixing its own logic