Goodness metrics update

This update emulates the ground truth paper