More changes to membership views / optimization