Did some more changes to the SPF.