refactor for easier tweaking