Redesigned packet. Needs testing