Continue on refactoring the demo scenario