Moved to using an ip field