perf improvements on inbound