Update script to support my latest configuration and use cases.