Tweaking IP logic