wieght chart
merge fixes