oops. missed a couple of things