Improvement and disk space check