refactor for prez