added null checks
added attack
things