updated to cohere with the tools.classes upgrade from a while back