Updated to latest sp.cls