Revisited tools

Adds missing updates for the last commit.