simplified scripts
more updates
script simplification