Adjusted to use the Kha/Kore submodule.