Sada 2 - template + refactoring