add more unsub checks