some templates redone