Debating if I should re-sub to the Max plan now (in case they grandfather people in some how) or if I should just wait and see what they announce.