Changed packet structure to reduce chance of error.