Updating the detection to a more forgiving method