add membership check + test