Missed a few changes when I copied this over yesterday