hack on membership tab - to be replaced with non-hack