non-members now properly excludes current members