Added a couple of tools