Better packet check
Simplifying