some changes + treemap