refactor the bench a little