I would drop signaled and use the timer here too