Expand templates

From Faster Than 20
Expand templates