Commit of Joe's updated driver