Autocommand NPC

Yep. Even more edits.