refactor + 2 more charts