refactoring & two-invokers example added