completed class template conversion