change scripts for better management