Now with option to for SPS