refactor for 7.2