Scripts: more changes based on how things work today