Updated to match the packet changes only