Chart 1/2 fully working

fixed