Updated scripts
Optimized