Modifications to allow for new packet format