State moved to NPC Class, more sense