added a "short" parameter to calculate only 8 metrics instead of 24