Fixing Devices
Merge