adding a few other cases