Added device settings back in