Final changes to master script