Replaced more packet code.