fixed drive function classes