Changes to the way the device is initialized
merged