Second Part of the Gonin IP reboot