all_metrics added
merge cboursnell changes