Added ability to be removed