Added some stuff to fix the signals