converted class command to non-template class