more refactoring and new IP addresses