woops, missed a few things