Improved signaling system, see dev diary