[MifthDemo] refactoring.. 2