minor changes to addign new device and locking