new tools stuff  and a fix