more packet version refactoring