locks were moved into device structure