Improved doc criteria.