refactoring, adding things