changed cancel so it works