WIP: refactoring the control flow