refactor for fadak