Now passes in device type