broke the signalling logic, updating to fix