template 7a 7b edited