Changed to template tool apart from error