Simplify packet logic