Revamped Next and NextStar Methods according to PKB Changes # 77