merge with our server IP hack