slight changes, preparing to refactor