Changes for weighted average