Upgraded to latest packet structure