Updated to match changes in the InfraRed module