Changed "whatnext" code