updated for hikari