changed name of functions to fit driver