Recommit of Tools-update