More changes/additions for SP.