add some more cases