put the use cases into tables for better clarity
Fixing merge conflicts