incoming refactor