Major improvement in many files