refactor for hehoku