Version including new measures