Big script edits