submod and script tweak