updated all tools to conform to new tool state api