modif for general template