Split scripts into new file
merge this
merge fix