added in AddDevice