Some changes to tools