Change according to comments 2

Signed-off-by: Janet Jin <janet.jin@turn.com>