combine packet types
update references