Redo ARP code