Moved signal code