Replacing the existing call check methods with a new improved version