switched to using templates
switched to using templates
Revert "switched to using templates"

This reverts commit cbe70c3ce278dedf69208286b00784d2cf32541f.