Fixing user drivers 2