Better attention to packet construction