Update to more standard definition.