Little bit modify the template