Metrics added to Matlab. Still to be verified