(added) - mostly script work