Updated tool