Improved the analysis