Tools modifcation