Update to include the hikari device as well