update based on CR comments @lizlux