removed teh dumbness on templates