Changes in the script (probably more to come)