added return from UDP for all modes