Looks like it, but have mixed feelings about that. I love the entire series except for the final arc. I hope they take some liberty there at least to cover some of the flaws (e.g. the lame battle against the quadruplets)