Modified join and split scripts to compensate for changed location