update based on Jihoonson's comments