template method FTW
moving annotation to pass collector
Merge branch 'refactor_local'