Design change for IPN handling