Signals now working correctly.