add random remove support