Re added my change to GUIDriver