refactored incoming