Another try to use Templates instead