cutting down on steps calling steps
moving the scenarios around