Make listfile 20% better