added a few other cases