Consolidate into one script