Added extra can attack checks