solved some design issue.