Enhancements to damaged state, added temp state