Some changes in the code, addition of the remove feature