restored pre attack state - 804e40e
nice formatting