add back in IP checking