move to the new logic