I am back ._
First commit with new edits in tfs
Only need fix npcs