refactor for 1.4.4