More changes to SIRFunction