New message discarding mechanism now working