Modify the scripts

Still don't know the right order for these commands