Updated remaining tools