Added IP checking