improved device adding