Some modifications for better state switching; started with attackstate