Update standard with all the new thinking incorporated