Devices improvements2