Death Toll: Update 23801

Fixed a duplication bug Some performance optimizations (more to come)