addressing @OlegHahm's comments