Random changes to driver code