Merging in the changes from bob dialog.