Adjusted script refs #20