Update based on Inari's comments