Update to TomSword