Changed all Chart-gen (Still testing)