Improved results, renamed files