I think the Part II 5695 and the PMI are both gonna die in 2017.  I just put a sticky note in my client file for next year...if things happen to get extended we can amend next season.