new script, plus clean up of old ones