oops missed a couple lines, just added them in