Improved the CI