Really corrected analysis tools as mentioned before.