Better attack detection!

Better attack detection!