Tried to re-rewite weighting