Added some SPO stuff