More work on tools