Re-ordered running order of script