Made consistent with newly documented approach