A new tool that seems to work ok.