Updated for dbl click to remove