Th2 c

You may take these changes after you have confirmed that your local EOS system is properly working. These changes are preparations for the next step, which is introducing local assembler class.