Tools modified to work for me