Creating warming states for regular character, and minor refactoring in warming pumped states.