fixed up these script before separation