Added exiting and removing