Small changes to script to better follow original design.