address review comments from kaze.