-Support for newer NPC's
-Part 3 of 'The Great Commit', all credits to L0ne_W0lf