Spam filtering revised, working version