Updated to new standard.