restored one-templated version