Added attack detection (wip)