Modifying Tool for new changes