Add some changes to make the tool more useful