Updated with some new tools