Adding changes Neelima wanted for evaluation metric