Merging changes for new drive