Added IP checks