Packet reformatting

Possible concurrency issue