bug fix. code reconstructure.
 comment.