refactoring a little for will