Corrected a prior conflicted commit
Corrected a small bug where a "for" should have been an "id"
Corrected a small bug where a "for" should have been an "id"