add more cases to extract