Added lotsa KSPI stuff