modif template and parsing