code refactoring: renamed signal, also moved some logic to commtrack signal.