Moved some functions to tools.h