Effects of previous housing conditions on shock-induced aggression