IP addresss fields removed, Payload fields fixed