Changes for $NEXT