some changes in visualize, non-final