change the structure of the IP handling