Updating Signals and Broke more code