Removed additional checks and modified IP checks