First packet overhaul changes, not yet tested