committed version of signalmaster