Added options to disable proximity detection.