Update to new diddleman