Baixin Refactor OK