Adjustments to script