Weights improvements