add sth to the remove function