added remove/checking functionality