did all of the extra refactoring