First round of revisions w/ Isa