Make flow more logical
Add another dimension to the scenarios