added driver notification to workspace
corrected merge conflict