Important weighted estiamtions calculation and other modifications
Update from LinuxMint