More tweaking of script