Combined more charts into functions