reflect review comments (partial, for test purpose).