Hard work done. Added weight to metrics calculation