Got it, thanks. I see that in #23982 some of the same discussion is underway. Should I revise this to just be for kyoto-tycoon, or should I keep both in here?