Added in templated for mark's experiment