improved scripts to avoid copy-paste