put back in pack/repack; flipped decoding order so no more magic #