Small changes for group selection