Missed a couple of things from the original