Added a couple more cases