#8 - Replace Type Code with State