Handle more complex cases