Updated IPN hander