Use new modular diddleman