WIP - Next Sets and a change in the plans