Updates per rjpower's comments