Changes to remove packet numbering