Added functionality to other cases