Renamed AffectedBlocks to NumAffectedBlocks and removed unnecessary if's