In Progress

script enhancements