Update for recent changes in incoming