Refactor launcher #2