added back some components; still works with device.