removed template hardcodings