Uncommented some stuff in NPC