Added more outputs and signal stuff