Change to more standard.