Update to accomodate is_full_member condition