forgot a few things converting over