refactor for zeus