Expand templates

From FMRIF
Expand templates