Address Driver OI changes

addresses issue #1