Added two additional measures