Removed .group and added NEXT