Added use cases 16 and 17.