Disabled use_ip code - needs more testing