changed the template plus small modif