First step of threadsafety...
Made signal system clearer