Made some changes to try and get signal r working.