Refactoring to trigger effect, started on Devices.