Improved scripts to avoid conflicts