standalone changes, added drivers