more script reorderings