[Wen Hao] - refactor, remove glue code.