Some updates to Attacker behaviour