NPC_Builder (me) loosing his last brain cell (reverted this to the old ver again)