Changed packet calculations to be only client based, and send the extra data through the header