Enhanced efficiency, changed filename