Updated for standard measures.