moved to new template parameters