noc
refactoring templates