forgot a few minor changes