Improved Tools