driver modifications and branchements (not compiling)
merge conflicts