fixes for driving the class