incoming some refactoring