updating tools to follow Renderer stateless change