Updates to driver script