added uip and prepare for switch to uip.