Added a remove and reset option