Redid my changes to be "correct".