Modified use cases again, apparently