Script review by Andreas Schuster with optimizations and better filtering