updated scripts, still untested