added more spam resilient code