Restored some tools